Merge pull request #1 from sizzly/dev

Dev to Master
Merge pull request #2 from sizzly/master

Stable