bug fixes
Merging Dev
Merge pull request #34 from MTVaught/mult-map-defaults

Bug Fixes