Fix Merge
Merge pull request #13 from Jimaine/fix-merge

Fix Merge