resolve merge conflict
Merge pull request #23 from victorleungtw/master

resolve merge conflict