Improved debug window
Merge branch 'develop'