Working Version
Merge branch 'master' of github.com:kvowinckel/CCC
Merge branch 'master' of github.com:kvowinckel/CCC