Merge pull request #634 from foxinushka/master

Fixed build in XCode 5.1