Merge pull request #2 from dubdabasoduba/develop

Merge pull request #1 from dubdabasoduba/master
Merge pull request #3 from dubdabasoduba/master

Merge pull request #2 from dubdabasoduba/develop