First update for version 0.7