Modify code to work with Scala 2.10
Fix package in scaladoc links