corrected a bug
Merge branch 'enhance_photo_album'