Propagate #16 and #17 updates
Merge pull request #22 from vicb/patch-8

Propagate #16 and #17 updates