fixed issues #1 and #2 + partial support for resizing