Merge pull request #44 from JohnWheel/master