Merge pull request #443 from neheb/master