Merge pull request #21 from johnhaitas/master

XCode 5 warnings