Merge pull request #132 from twogee/magic-names-redux

More MagicNames