p1217-1219
Merge pull request #38 from kinglouisxiv/patch-1

p1217-1219