Bugfixes
Merge pull request #42 from SecondGenDesign/Tristan

Bugfixes