fixed implicit swizzling
Merge remote-tracking branch 'tezar/master'