Commit 09133c93493ec345bd5310fdee246b67caeb4358

czurnieden 2018-12-12T00:18:22

additional bugfixes