Fix #221
Merge pull request #222 from scala/issue-221

Fix #221