kgryte Merge pull request #2 from mortonfox/patch-1