punctuation regex updated to exclude brackets from tokens
data model updates
Merge remote-tracking branch 'origin/master'