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

Final commit of the night