fixed issue with initial height calculation of scrolling container.
resize on load is working.
Merge remote-tracking branch 'origin/master'