improved some aspects of the documentation
Merge remote-tracking branch 'origin/dev' into dev