standardise headers - fixes #6
Merge branch 'image_backed'