Integrating Cristina's comments
Update: version 1.4