Merge novius-os/novius-os/pr:36 from @jayps
Merge origin/master/0.2 into rel/0.2.1