Add specs for issue 548
Merge pull request #103 from xzyfer/wip/issue_548

Add specs for issue 548