maps and buttons
Last merge
Merge pull request #56 from gaandrey/stage

maps and buttons