15% Performance impovement
Merge tag 'v1.0.4'
Remove deprecated use-mirrors