Merge pull request #7 from rhayes-cida/master

GWDP-697