Text updates, version update, removed `convert` method
Changed version to 1.0.4
Merge branch 'master' into scala-2.10