Merge pull request #110 from DemonWav/master

Fully updated to support new 1.8 blocks: