merge with fusijie/master and fix pointlight