p1269-70 plus some SullivansJohn missed previously
Merge pull request #59 from kinglouisxiv/patch-9

p1269-70 plus some SullivansJohn missed previously