Add pausing to Entity
Update docs
Merge branch 'master' into gh-pages
Update docs