Pull the master branch

Couldn't merge branches