MORE REWORK
also pause is functional
Merge pull request #6 from kalodsun/master

MORE REWORK