more gracefully exit
Merge branch 'develop'
fix branch