Fixes
Merge branch 'master' of github.com:donnanicolas/bearded-octo-hipster