Merge pull request #10 from jryberg/master

Cleaned up the code