simshaun Merge pull request #2 from bierdok/patch-1