hitting the pause button
fixed issue
Merge branch 'master' into develop