update convcontroller 23/05
Merge origin/master