Added support for main class in build
Merge branch 'master' into scala-2.11