Merge pull request #661 from StevenRoddis/panelsy

Fixes #650