Merge pull request #8 from 90arther/master

Merge pull request #7 from 90arther/develop
Merge pull request #9 from 90arther/develop

Merge pull request #8 from 90arther/master