improved callback parsingirb
added token validation to callback parser
Merge branch 'master' into working