pallo to ride conversion
Merge branch 'develop'