Merge pull request #463 from ndawe/master

[MRG] docs fixes