Merge pull request #8 from Studio51/master

Merge pull request #7 from Studio51/develop
Merge pull request #9 from Studio51/develop

Merge pull request #8 from Studio51/master