4 from Xcode
Merge remote-tracking branch 'max_temp/master'
merge with remote code
modified from Xcode ........