text file added to v_1.2
Merge branch 'master' into v_1.2