Merge pull request #173 from mpeuster/master

Fixes for Y1 demo