JSPACE-77 JSPACE-94
Merge branch 'master' of https://github.com/knowledgearc/jspace