palmiak Merge pull request #2 from CNick/patch-1