Integrating picture tag. Fixes #6