Merge conflict fixed
Merge pull request #21 from GotoLink/master

Merge conflict fixed