Merging changes from Scala branch
Bumped version to 2.0.0 -> typesafe construct