WIP
Merge pull request #163 from unwin/develop+RDS_Sept_10

WIP