Merge pull request #305 from neheb/master