Add specs for issue 550
Merge pull request #105 from xzyfer/wip/issue_550

Add specs for issue 550