https://jspace.atlassian.net/browse/JSPACE-14
Merge branch 'abstract' of https://github.com/wijiti/jspace into abstract