Upgraded to C4.1
Merge pull request #91 from hintjens/master

Upgraded to C4.1