Merge pull request #1048 from pazguille/v1.0

Update documentation.
Merge remote-tracking branch 'chico.ml/v1.0' into v1.0