Fix Bug #8

issue #8
Merge pull request #9 from wangwangwar/fix-bug-#8

Fix Bug #8