fixes
Merge pull request #77 from PhilippSteiner/Philipp

fixes