Merge pull request #9 from muxahuk/master

Marge
Merge pull request #10 from muxahuk/develop

Merge pull request #9 from muxahuk/master