updated build file to support cross compilation with scala
Merge remote-tracking branch 'origin/master'