Fix Close Function, Manage Panel Correctly

- Fixes #50
Merge pull request #52 from joefitzgerald/fix-close-function

Fix Close Function, Manage Panel Correctly