Merged branch to the master