1.1.2 wip

Same as #49 but without the merge of #37 to see if that allows for a clean merge.