Addresses #92 and #119 for version 6.x