Fixes bugs #12 and #13
Merge branch 'master' of https://github.com/ccancinos/rinzo-xml-editor.git