Fixed possible name resolution problem.
Merge pull request #34 from Undev/master

Fixed possible name resolution problem.