Merge pull request #1 from Positive07/patch-1

Merged by hand