Merge pull request #1 from mjoos/development

First pull request