Multiple maps working
Many small details
Merge pull request #14 from fssaez/master

pull jun6
Small changes
Merge pull request #17 from ManuelCintron/master

updating