Updates to #212 and merge of #209