Merge pull request #16 from cspace-deployment/rev1

Bringing master into sync with rev1