coeus-5.2.x merge - fixes per pull request #147 comments