more changes from featurea
add new master file