minor changes before demo
Merge pull request #31 from Gegga87/master

minor changes before demo