Small bug fix.
More sensible layout.
More sensible layout.
Merge remote-tracking branch 'sourceforge/master'
Merge remote-tracking branch 'github/master'