recomposed the map initializer, added map function and default map function.
prevented default form function
Merge pull request #19 from ahegyi/sarahs_branch

recomposed the map initializer, added map function and default map funct...
Merged my changes with Sarah's.
Trying again to merge changes.