Fixed fast forward merge to master