Merge pull request #16 from baasbox/master

update from origin master
typo
Merge pull request #98 from giastfader/master

Typo