many bug fixes all around
Merge pull request #115 from clovis/master

Many bug fixes all around in preparation of the demo