Credits basic
Merge branch 'NewMaster' into GUI