Merge pull request #35 from MisterJames/master

branch sync
Merge pull request #36 from MisterJames/dev

Merge pull request #35 from MisterJames/master