Merge pull request #146 from ndawe/master

[MRG] docs fixes