Closes #31
Merge pull request #39 from M-Zuber/Development

Remove old Da