Alright hopefully this one is ready for merging
Merge pull request #146 from Kyxsune/patch-2

Alright hopefully this one is ready for merging