Start of refactor to improve interface and reduce dependency issues
Merge branch 'master' of https://github.com/Catchouli/coment