Issue #40 - Prepare for release 6.0.0