Add specs for issue 614
Merge pull request #122 from xzyfer/wip/issue_614

Add specs for issue 614