Merge pull request #4 from dieg0-/master

Merge pull request #6 from petiteargen/master
Clean up code
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Fixed HashMap creation from XML
Merging issues
Merge pull request #7 from petiteargen/master

Fixing HashMap from XML