Occam'd
Made drawTextWindow parameters more useful
Merge branch 'master' into gh-pages