Xcode 5 fixes
Merge pull request #15 from square/kve/xcode5

Xcode 5 fixes