from os_x local commited remote
Merge branch 'master' of https://github.com/ric-cardo/test