Merge pull request #19 from hperadin/master

Tests for Xml <-> Json (de)serialisation, test Xml and Json files, and changes to the code according to test results
Merge remote-tracking branch 'upstream/master'