Fixed some parsing issues
Merge remote-tracking branch 'origin/pictures' into pictures