cleanup
Merge pull request #11 from kmchugh/dev

cleanup and allowing functions to be decorated