Merge pull request #27 from yushan87/bug-fix

Bug fix