Fixed documentation
Merge branch '1.0.0' into devel