Fixed merge from master and updated files