More documentation
Merge pull request #265 from pawal/master

More documentation