Fix for pattern matching issue #18
Version number update
Merge branch 'master' into scala-2.10