Fixed 1.8 compatibilitywq
Merge pull request #760 from masuidrive/fixed_compat

Fixed 1.8 compatibility