Merge pull request #214 from pborreli/typos