pushing v1.0.0
Merge branch 'master' of https://github.com/jonchretien/conveyor