Merge pull request #6 from ripflame/master

Adding CPC views
Merge remote-tracking branch 'upstream/master'