This thingy.
Merge pull request #134 from Adron/master

This thingy.