Merge pull request #101 from marshmellow42/master