Moved part of _resolve into public resolve to make _resolve easier to override.
Gah, bugs!
Updated version to v0.3.5