making it all work on a transformer stack
Merge branch 'master' into f-add_reader
fixing merging stuff
reader works i think
Merge branch 'f-add_reader'