Merge pull request #48 from septadev/development

Development
Merge pull request #62 from septadev/development

Development
Merge commit '2269e7397c80d38a94fcc5ea377f705794978954' into development

* commit '2269e7397c80d38a94fcc5ea377f705794978954':