Tweaks for #242.
Merge branch 'master' of github.com:Ecotrust/solomon