Fixes
Merge branch 'MasterMergeWorking'