Merge pull request #1 from Greenlock/develop

Merge develop to master
Merge pull request #2 from Greenlock/master

Merge pull request #1 from Greenlock/develop