Consumable fix
Merge pull request #7 from sharkiller/patch-1

Consumable fix
Merge pull request #1 from DatZach/master

Merge