Version 0.2.
Merge branch 'master' into scala-2.11