Close issue #1. Close issue #3. Close issue #5.
Merge pull request #7 from hollyxu/hx-fix-bugs

Close issue #1. Close issue #3. Close issue #5.