Merge pull request #1307 from benjaminvialle/1.0.x

1.0.x