Fix class merging
Merge pull request #1362 from visionmedia/class-merging

Fix class merging