Fixed typo
Merged after resolving conflicts
Fixed typo
Merge pull request #1 from jossy/patch-1

Fixed typo