fix key lookup and made json wrapper the primary
Merge pull request #3 from williamwicks/master

fix key lookup and made json wrapper the primary