Merge pull request #89 from ndawe/master

[MRG] docs improvements, etc.