better handling of multiple runs
Merge branch 'master' of github.com:alvinr/scripts