Merge pull request #1 from pwrap/master

pull for John
Merge pull request #2 from pwrap/John

Merge for nathan