Merge pull request #14 from Mirinth/development

Development
Merge pull request #15 from Mirinth/master

Merge pull request #14 from Mirinth/development