Repair Proform
Merge branch 'Momchil'