Fixed compiler warnings under XCode 4.6
Merge pull request #1 from jossgiffard/master

Fixes