Status now working
Merge branch 'master' of https://github.com/conundrum/bash_scripts