Merge pull request #27 from danielkutik/master

Just cleaning up a little