replace disallowed characters '@' and '-' in method names
Merge pull request #13 from fabb/master

replace disallowed characters '@' and '-' in method names