Add specs for issue 660
Merge pull request #143 from xzyfer/wip/issue_660

Add specs for issue 660