p Merge pull request #294 from askobara/fix-nameerror …