#38 fix resizing bug when scrollbar is shown
close #38: Merge branch 'develop'