Added minor logic for maps printing.
Merge remote-tracking branch 'origin/master'