Merge pull request #52 from kaitlinhuben/master

More changes to cfunct.py - not done yet (don't merge)