modification of photoadaptor
Merge branch 'master' of https://github.com/Timego/timego