fix
Merge pull request #392 from VanillaSalt/patch49

fix
code
Merge pull request #15 from Fluorohydride/master

merge
Merge pull request #16 from Buttys/master

merge