Merged Conflicts

I'm not sure whether what I did is correct or not
Merge pull request #245 from melvin0008/patch-6

Merged Conflicts