Implemented #73. Possible fixes to #62, #65, #55 on 1.7.2.