Make changes for xcode 6 beta 4. add convert string x to int.
Merge remote-tracking branch 'origin/master'