Updated documentation
Merge pull request #597 from hrajchert/master

Updated documentation