Merge branch 'master' into pausestate
Added pause capability
Merge branch 'pausestate'