Version 0.7 corrected