Merge pull request #20 from danielkutik/master

Cleaned up a little