almost final commit
Merge branch 'master' of https://github.com/laurentmarchal/thoji_flowball.git
almost final commit