Add images for annotation callout; add Uber call
merge with upstream master
Merge branch 'kirby-master'

merge with changes from Leo
Merge pull request #31 from kirby/master

Add images for annotation callout; add Uber call