Merge pull request #47 from izrik/cleanup

Cleanup