Added checks for empty string variables
Merge branch 'master' of github.com:C-Stevens/misc-scripts