Merge pull request #55 from iMarbot/master

Fixing #54 + Vanilla Update