Merge pull request #3 from cyrille-leclerc/master

clickstart fixes