changed r to a
Merge remote-tracking branch 'origin/master'
changed % to fmod() for doubles