Added json token
Merge pull request #37 from conorfennell/master

Added json token