Merge branch 'master' into doc
Linting.
Merge pull request #2 from isaacazuelos/doc

Doc