Merge pull request #330 from Maltis/patch-1