fix for cannot redeclare class issue
Merge pull request #17 from edea/hotfix/Issue16

fix for cannot redeclare class issue