added pause functionality
merge fixes