Test and fix for #124
Add License file
Test and fix for #125.
Merge branch '2.3'

Conflicts:
	build.sbt
Import ambiguity
Test and fix for #127
Merge branch '2.3'