Updated fork from master repo to 0.7.0