Fix conflict with different version number
Merge pull request #1 from hinok/patch-1

Fix conflict with different version number