Patch for #18
Merge branch 'hookah' of github.com:mithra62/ee_debug_toolbar into hookah