fixed typo
Merge pull request #1 from emmano/master

Merge