Improve context display
Improve context display
Merge branch 'rel/0.2' of git://github.com/novius-os/core into rel/0.2