Merge pull request #303 from neheb/master