Cleanup
clickstart metadata
Merge pull request #1 from cyrille-leclerc/master

Enhancements