Merge pull request #1 from figmints/master

Merge so hard
Merge pull request #2 from figmints/staging

Merge pull request #1 from figmints/master