Dev to master and finish