Addressing compilation errors with XCode 6
Merge pull request #399 from darend/master

Addressing compilation errors with XCode 6