#23 merge with formatting improvements
#23 merge with formatting improvements

bmdeveloper/firebug.next,vlajos/firebug.next,bmdeveloper/firebug.next,firebug/firebug.next,firebug/firebug.next,vlajos/firebug.next