Fix #94: add a unified interface for pictures
APE: full picture handling