Clean up
Merge pull request #1 from okfde/master

Clean up