Changes for version 0.6