merge dev branch add afile.text