Fix #92
Merge pull request #155 from twbs/fix-92

Fix #92