Merge pull request #3 from wmandrews/patch-1