merge erickriger-master into pr44