Merge pull request #7 from petiteargen/master

Fixing HashMap from XML
Merge pull request #5 from dieg0-/master

Merge pull request #7 from petiteargen/master