v1.0.18
Merge pull request #22 from gsaunier/master

1.0.18