Merge pull request #581 from ndawe/master

clean up