Almost final
Merge branch 'master' of https://github.com/adiucu01/wildrideproject