Syncing master and develop branch