Some changes for the 0.6.1 version