Dev fireozone

Because there is only one branch left, all development can be done on master branch.