Merge pull request #1 from figmints/master

Merge so hard