Merge branch 'release/0.2.4' into develop
pallo to ride conversion
pallo to ride conversion
Merge branch 'develop'