Merge pull request #10 from drakojn/develop

Develop
Merge pull request #14 from drakojn/develop

Develop
Merge pull request #13 from drakojn/master

Merge pull request #10 from drakojn/develop