Merge pull request #30 from mysteriosum/master

pulling
Merge branch 'master' of https://github.com/Mchapuis/ChromatoseGit