Merge pull request #10 from mysteriosum/master

taking your changes, this is written by martine
Merge pull request #11 from mysteriosum/master

Getting on May 4
Just the gizmo dad or whatever
Merge branch 'master' of https://github.com/Mchapuis/ChromatoseGit
The stuffs that I change! Sat May 4

Signed-off-by: Mchapuis <machapu@gmail.com>
Merge pull request #21 from Mchapuis/master

This one's for real