step and map work
Merge pull request #6 from sundmanbo/master

step and map work