Fix the xcode 6.1 compilation issue
Merge pull request #25 from GiorgioNatili/master

Fix the xcode 6.1 compilation issue