wait on kill
Merge branch 'develop'