Merge pull request #59 from l1ll1/master

fix for Herman "Nano"'s bug