CHANGES IN THIS BRANCH, YO
Merge pull request #2 from korsiber/master

Automatic merging? Please?