Update from mac
Merge branch 'master' of https://github.com/lgaultier/These