Resolves #181.
Merge branch 'webgis'