Merge pull request #261 from ndawe/master

MRG: A few minor changes