brings the build in line with core
Merge pull request #20 from xeno-by/scala

brings the build in line with core