Upgraded version to 0.7