All is working, merging with master