Corrections contributed by Daniel Boucher.

git-svn-id: http://minini.googlecode.com/svn/trunk@50 d3bb1009-b34b-0410-a953-9553400e274a