Spec for issue #149.
Merge pull request #150 from dblock/issue-149

Spec for issue #149.