Some cleanup and changed JSON handling.
Added unsupported exception.
Cleanup. Added basic JSON output.
Merge pull request #67 from jbreitbart/master

Cleanup