Added images + proximity detection. Done.
Merge remote-tracking branch 'origin/master'