Updated comments from todd and some xml stuff
Merge pull request #65 from mierze/master

Updated comments from todd and some xml stuff