Add in custom resolve. Updated with proper fetch reverted upstream.
Update for version release v1.0.6