Cleanup commented out code and puts statements.
Merge pull request #29 from mjafshar/cleanup

Cleanup commented out code and puts statements.