added json support
Merge branch 'master' of github.com:gsmirnoff/marketing