Fix for issue #15 - support for Retina maps
Formatting