Updated documentation
Merge pull request #359 from Bladrak/doc

Updated documentation