Fixed merge
Merge pull request #1 from deedwar/patch-1

Fixed merge