Fix merge II
Merge pull request #1 from metaiiica/patch-1

Fix merge II