Merge pull request #496 from neheb/master