Scala version
Merge pull request #1 from jeantil/master

Scala version