Merge pull request #34 from ctorstens/development

Development
Merge pull request #41 from ctorstens/development

Development