Merge pull request #479 from neheb/master