Fix a bug I guess
Merge pull request #50 from hoxo-m/master