Pushing new setup to master