resolve merge conflict
Merge pull request #14 from AlexChien/patch-1

resolve merge conflict