* Fix photocomp
Merge pull request #260 from iseppi/photocomp

 * Fix photocomp
Merge pull request #77 from zookeepr/master

Merge upstream to lca2013