1.5.2 support. closes #265. closes #266