Work towards issue #11 need some testing against the test gateway to check it works properly.

Also the last entry they provided has a weird character, check that.