Fixed dependencies on 'repo' and corrected import URLs
merged master