Clean up...
Merge pull request #1 from gnustomp/patch-1

Clean up...