FIX: Some (but not all) NameError clashes
Merge pull request #2 from danil/master

FIX: Some (but not all) NameError clashes