Fix "attempted duplicate class definition" errors
Merge pull request #26 from Bronsa/master

Fix "attempted duplicate class definition" errors