Fixed compile errors and warnings resulting from the Xcode 5.1 update
Replaced returning empty strings with null
Merge pull request #159 from lilligreen/xcode

Fixed compile errors and warnings resulting from the Xcode 5.1 update