No more local changes
Merge branch 'master' of github.com:TommieV/PR
Fixed compile errors