merge #31 into dev

Initial commit for maps