Retain remote WMS

First attempt at #148 - please test
Merge pull request #152 from tomchadwin/master

Retain remote WMS