Closes #36
Merge pull request #44 from M-Zuber/Development

Closes #36