Enhancements to to_json function
Merge pull request #5 from dnmiller/enhancements-to_json

Enhancements to to_json function