merged changes branch with master - now works both 3 pictures plus the
albums and cover