Fixes #153, Fixes #155
Merge branch 'master' of github.com:afaqurk/linux-dash