Theoretically fix #360
Make window_width an int
Merging upstream
Re-add horizontal align and width to fix #258
Merge pull request #362 from svtdragon/master

Re-add horizontal align and width to fix #258