Added offline/online status
Merge branch 'master' into mongodb
Minor cleanup