Json token plus timeout
Merge pull request #62 from conorfennell/master

Json token plus timeout