Add specs for issue 549
Merge pull request #104 from xzyfer/wip/issue_549

Add specs for issue 549