Merge pull request #18 from sli-fox/steph_branch

Steph branch
ready to merge with master
Debug changes
Added map stuffs