Merge branch 'master' of github.com:spumko/joi

Merging upstream
Fixing failing test
Small refactor
Merge branch 'master' of github.com:spumko/joi

Merging upstream
Merge pull request #81 from wpreul/master

Fixing failing test