Merge pull request #284 from Ocramius/DCOM-175

DCOM-175