Merge pull request #482 from ndawe/master

[MRG] cleanup