Merge branch 'patch-2' of https://github.com/jaymartin7/pyramid into patch-2