digitarald Merge pull request #1 from eviljeff/patch-1