fixed name handling, need to alter this later to improve stability in the long term
Merge branch 'master' of github.com:acadien/scripts
daily - bug fixes galore