Removed unneeded defer call.

Not sure how this ever worked
Merge branch 'master' into gh-pages
Updated docs