Merge pull request #3 from khawkins/master

Making swizzled method names more unique, to avoid clashes