Made this thing safe as default.

Unsafe can be turned on by passing in an unsafe parameter in the
options.
Merge branch 'master' into gh-pages