Add parse_concatenation
Merge remote-tracking branch 'sorear/master'
minor tweak