edge tying
edits
cpuconv
Merge branches 'master' and 'cpuconv'
minor edits