Added pause functionality.
Merge branch 'master' into art
Garbage.