Fixed problem with \map options
Merge branch 'dev' into ms