Reintroduced the Map for easier retrieval. Used already existing Property objects
Merge branch 'master' of github.com:mtoonen/propertiesparser