Merge pull request #156 from keneanung/master

Fix keneanung/#3