Fixed bug
Merge pull request #1 from jyhnihao/dev

Fixed bug