Changes for version 0.07