Merge pull request #10 from drakojn/develop

Develop