bug in resize-mechanism fixed
Merge origin/master