Takepic to master merge