Merge pull request #22 from AaronGreenberg/master

So catch curve 2
CCII formatting
Merge pull request #25 from dknip/master

CCII formatting