Merge pull request #24 from theponti/development

Development