Merge pull request #1 from arakasi72/develop

Develop
Merge pull request #2 from arakasi72/master

Merge pull request #1 from arakasi72/develop