Development

Merging development to master. Commits include mod_imgtools 1.0 and a draft experiment.