Merge pull request #92 from ndawe/master

[MRG] miscellaneous cleanup