updates based on version 0.9.0