cleanup
fix typo
Merge pull request #787 from thomas33/master

Cleanup 2