Merge pull request #9 from cspace-deployment/master

Bringing rev1 into sync with master
Merge pull request #10 from cspace-deployment/rev1

Merge pull request #9 from cspace-deployment/master