Fixes Mantis issue 34.
Merge branch 'master' of https://github.com/iguess/iguess