some more documentation
Merge branch 'refs/heads/master' into progress-bar
updated documentation