Merge pull request #12 from cspace-deployment/master

Bringing rev1 into sync with master