added info at the top of src files
merging local branch with master