Fully updated Swift Version like current Objective-C version
Merge remote-tracking branch 'origin/master'