Helps if I return things =/
Merge pull request #276 from iarna/refactor-metatable-upgrade

Helps if I return things =/