Final commit of the night
Merge pull request #2 from Aurilux/master

Final commit of the night