Merge pull request #8 from dubdabasoduba/develop

Master setup
Merge pull request #9 from dubdabasoduba/master

Merge pull request #8 from dubdabasoduba/develop