Upgrade to version 1.0.6
Merge branch 'master' into scala-2.10