Merge pull request #676 from stephanh/minor_fixes

Minor fixes.
Fixed bug in package.scala.
Bumped version to 0.9rc4 in package.scala.