Merge pull request #1 from claneys/patch-1