better merge of slight modifications, keeping intermediate code updates
Merge branch 'patchmerge'