Committing before merge to master