Merge pull request #1 from rootzid/development

Development
Merge pull request #2 from rootzid/master

Merge pull request #1 from rootzid/development