Some changes in credits
minore changes in credits
merging the master