Added changes from Benni, because he got no git at his current workspace

fixes #49 and #59