Fixes #117
Merge pull request #119 from twbs/fix-117

Fixes #117