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

refactoring