Few changes...

see #585
Merge branch 'master' into feature-responsive
Fix resource usage display.

see #585