Merge pull request #476 from blogic/master