Clean up
Merge pull request #6 from vemacs/patch-2

Clean up