Merge branch 'gh-pages'
removed lifting of callbacks

Not needed
Merge branch 'master' into gh-pages