:gb: Refactored out layer parsing to updateLayers method.
Merge branch 'master' into gh-pages