Some enhancements and additions

Hi,

I forked your repo and made some improvements (in my opinion). Mostly I just did them simply because I wanted to and since it was licensed with WTFPL I figured it couldn't hurt :)

Don't consider this a "formal" pull request. I just wanted you to see what I had done in case you were interested and this was the best way I could think of. Feel free to simply ignore/deny me or cherry-pick what you want etc. 

When you look at the diff as a whole it doesn't make much sense because the whole code is so short. But hopefully it becomes clear when you look at each commit.