Restore remote server behavior
Merge branch 'dev' into gns-117
Merge pull request #29 from planctechnologies/gns-117

Restore remote server behaviour