fix multiple bug in stream and restart - fixed #14
Merge branch 'restartStream' into develop