Merge pull request #1 from Zulko/master

NameError fix