Rollover to version 0.9