Merge pull request #20 from ivuk/master

Some documentation fixes