blackwinter Merge pull request #5 from cczona/patch-1 …