progress
Merge branch 'master' of github.com:princelab/scripts

not sure