Fixed R2D2 bug
Merge remote-tracking branch 'origin/master'