Merging picture selection and master
Merge pull request #2 from jordenh/pictureSelection

Merging Picture selection
merge