Merge pull request #787 from annando/lsr-pictures