Created by: trekdemo
I tried to fix #179 (closed) with the least change in the current code.
@graysonwright I didn't look into the projects source too deep, so I might broke some parts that are not covered with tests if there are any. Can you give some hints if something else needs to be done?