make branch configurable outside of script
fix join not executing
Merge branch 'master' into persistance