Fix for issue #57.
Merge branch 'master' of https://github.com/egrove/valerie