Fixes #106
Merge pull request #120 from twbs/fix-106

Fixes #106