Unsafe/Insane fix for #3
Merge pull request #4 from andypetrella/fix-cp

Unsafe/Insane fix for #3