Merge pull request #216 from stevenvanrossem/master
authorstevenvanrossem <steven.vanrossem@intec.ugent.be>
Fri, 5 May 2017 09:08:43 +0000 (11:08 +0200)
committerpeusterm <manuel.peuster@uni-paderborn.de>
Fri, 5 May 2017 09:08:43 +0000 (11:08 +0200)
several bug fixes and updates


Trivial merge