Merge pull request #1 from gusaus/7.x-1.x-panels

refactoring