Minor tweaks & additions
Merge branch 'master' of github.com:tyhawk/tyhawk-shell