Feature/sbt 013