Merge pull request #1 from Progglord/master

Frankly I don't know what I am doing