Merged with the fork from jobtalle
Merge branch 'master' of https://github.com/thumaszz/ccore