Merge pull request #143 from mower7/master