Updated with latest and greatest (v2.0.0).