ported repository to Scala
Merge branch 'feature/scala' into develop