Fix #419, cannot compile in xcode 6 beta 2
Merge pull request #420 from cybertk/master

Fix #419, cannot compile in xcode 6 beta 2