Added Map and Token functionality
Merge pull request #42 from zcmoore/master

Added Map and Token functionality