Let's just keep master as production and not make it too complicated