Optimized to ~20 FPS according to Genymotion-emulated Nexus 5
Merge remote-tracking branch 'origin/master'