1226-1229 plus some additions to 1220
Merge pull request #42 from kinglouisxiv/patch-1

1226-1229 plus some additions to 1220