brianlheim Merge pull request #104 from spluta/patch-3