Merge pull request #6 from zjjott/master

Fast Forward to master
Merge pull request #7 from zjjott/develop

Merge pull request #6 from zjjott/master