Fix c*r functions

Also makes an additional 199 tests pass now!
Merge remote-tracking branch 'refs/remotes/upstream/master'
Merge pull request #9 from csziacobus/master

Fix c*r functions