saviour
Merge https://github.com/bcowzer/classpic2