Fix possible name collision
Merge pull request #49 from alexeyvo/development

Fix possible name collision