Fix issue 213
Fixed issues related to last commit (dcd363f2cb8cbb08a0113a370c0fcc506061aa8b)
   - characterset issue with ita
   - commited conflict info from nor
Merge pull request #220 from ianwallen/Branch_a6a1b2af565d7e159c4a644e8c82475063912773

Fix issue #213