Fixes #006.
Merge branch 'master' of https://github.com/mattgallivan/pope