Add resize handler
Merge branch 'resize'