Fixed compilation issues / warnings for Xcode 6.1.1
Merge pull request #2 from ColinEberhardt/master

Fixed compilation issues / warnings for Xcode 6.1.1