#2 fixed.
Merge pull request #3 from cnluzhang/dev

#2 fixed.