NSString->NSDictionary
Merge branch 'dev'