Merge pull request #47 from rhayes-cida/master

EDEN-22
Merge remote-tracking branch 'upstream/master'
Merge pull request #48 from rhayes-cida/master

Fixes for several bugs
Merge remote-tracking branch 'upstream/master'