Merge pull request #21 from jgoley/jonathan

Switches magic function to prototype of Player