I hope this one is the last
Merge pull request #54 from Boned-777/fix8

I hope this one is the last