removed single quotes
Fixed a few bugs in status engine
Merge remote-tracking branch 'origin/master'