Merge pull request #120 from wlue/master

Fix Xcode 6 warnings.