ms2008 Merge pull request #98 from lifeblood/patch-2