changed links to integrate with version0.8 branch