Added initial mapping functionality
Merge pull request #5 from Bkahler/master

Added initial mapping functionality