Merge pull request #35 from sillymoose/master

Fixed JSON quoting and test file
Fix nomenclature per recent discussions