Need to rethink Java <-> scala API
Merge branch 'master' of github.com:hltcoe/concrete