Merge pull request #218 from stevenvanrossem/master
authorstevenvanrossem <steven.vanrossem@intec.ugent.be>
Tue, 9 May 2017 12:53:56 +0000 (14:53 +0200)
committerpeusterm <manuel.peuster@uni-paderborn.de>
Tue, 9 May 2017 12:53:56 +0000 (14:53 +0200)
some updates, mainly demo features


Trivial merge