Flickr branch

THis is my request to add flickr the master