add simple functionality
merge fixes
Merge branch 'master' of https://github.com/rsepassi/map_pics
merging