siovan Merge pull request #4 from ideasman42/patch-1