Merge pull request #221 from mpeuster/master
authorpeusterm <manuel.peuster@uni-paderborn.de>
Fri, 19 May 2017 10:03:17 +0000 (12:03 +0200)
committerpeusterm <manuel.peuster@uni-paderborn.de>
Fri, 19 May 2017 10:03:17 +0000 (12:03 +0200)
Cleanups and fixes for upcoming v2.1


Trivial merge