Merge pull request #1 from rootzid/development

Development