ok
 modify
Merge pull request #64 from Keerecles/lishihao

Merge changes from Lishihao.