I'm coming...
Merge pull request #35 from linsk/master

I'm coming...