Merge pull request #8 from theoriginalbit/master

CC 1.5/1.6 support