Added XML parser.
Updated comments.
Merge