Added concat function.
Merge branch 'concat'
Merged concat and master
Fixed conflicts.