Fixed errors due to a different install of python
Added tests for '\n' and '\t'
Merge tag 'CL2'