Workingscratch

Merge with master