fix
fix
Merge pull request #397 from woodee/patch-10

fix
Merge pull request #398 from woodee/patch-11

fix
Merge pull request #19 from Fluorohydride/master

merge
Merge pull request #20 from Buttys/master

merge