Work mast merge

Merge changes on working and master