Merge branch 'develop'
using suggested buffered channel for signal
Merge branch 'master' into develop