Merge pull request #538 from zejn/patch-1