Updated version to 1.0
Merge branch 'master' into scala-2.10