Merge pull request #509 from neheb/master