Fixing #54 + Vanilla Update

Updated to last 1.7.X pack.