code restruct., varcount, optim. -> code restruct., optim., varcount
Merge branch 'master' into arraysplit