Merge pull request #14 from cyrille-leclerc/master

Clickstart cleanup