Patch Set 5: Looks good to me, but someone else must approve; IP review completed

I worked on all of Robins comments. This lead to changes mostly on comments. To get around String encoding problems for the merge test data I decided to use the default encoding defined in Constants (wich happens to be UTF-8)