Merge pull request #85 from sudden6/master