Cleanup
Merge pull request #3 from uken/cleanup

Cleanup