Add picture frame support
Merge pull request #8 from wader/picture_frame

Add picture frame support