Fix #47
Merge pull request #49 from yuxxxx/Fix47

Fix #47