Fix to use sport object rather than array
Merge branch 'beta'