Implemented 2 chars indents
Added comment
Merge branch 'master' into xml-2char-indent