Merge pull request #3 from lbarstow/master

merge
Map!
Map!
Map!
Map!
Map!
Merge pull request #6 from hjfender/master

HI HENRY!