Merge pull request #1 from Firefishy/patch-2