Refactored for Scala, bumped version. v2.1.1 built.