Updated for new NSDictionary syntax.
Merge remote-tracking branch 'origin/master'