Fix merge conflict
Merge pull request #2 from leeplay/master

Fix merge conflict