fixed minor bugs
Merge pull request #1 from fanbomeng/master

fanbo
some change in the photon file