ditched splitjoin added expand
Merge branch 'master' into ubuntu