better naming and Pause/Resume management
Merge remote-tracking branch 'origin/master'