Version 1.0.1
Merge branch 'master' into scala-2.10