Merge pull request #91 from marshmellow42/master