Added questions with maps
Merge branch 'dev'