Merge Master version 0.7