Merge pull request #28 from Mchapuis/master

BOP IT. PULL IT
go;
leftovers
Merge branch 'master' of https://github.com/mysteriosum/ChromatoseGit
Some random little fix/changes

Signed-off-by: Travis Henry Martin <travis.h.martin@gmail.com>
Merge pull request #20 from mysteriosum/master

stuff