Improve pom.xml
Trim spaces in StringOption
Merge branch 'master' into Scala-2.9.2