cleanup
Merge pull request #783 from thomas33/master

cleanup