MOSYNC-2831: Proper encoding
Merge pull request #43 from mattiasbybro/ThreeTwoOne

MOSYNC-2831: Proper encoding