Try to fix it
Merge pull request #24 from hfanc001/master

Try to fix it