Merge pull request #160 from mpeuster/master
authorpeusterm <manuel.peuster@uni-paderborn.de>
Thu, 18 Aug 2016 07:28:19 +0000 (09:28 +0200)
committerpeusterm <manuel.peuster@uni-paderborn.de>
Thu, 18 Aug 2016 07:28:19 +0000 (09:28 +0200)
Cleanup and bugfixes


Trivial merge