include virtuals in json schema
add missing semicolons
Merge branch 'master' into feature/bounce_token