Debug changes
Added map stuffs
Merge pull request #19 from sli-fox/steph_branch

Steph branch