Cleanups
Merge pull request #64 from eile/master

Cleanups