Propagate #16 and #17 updates
Merge pull request #23 from vicb/patch-9

Propagate #16 and #17 updates