lighter version of the mothership
Merge branch 'master' of https://github.com/bgirard/ToJAM2013