fixes
Merge pull request #75 from PhilippSteiner/Philipp

fixes