Merge pull request #312 from elextr/reflow_fix