Add specs for issue 535
Merge pull request #102 from xzyfer/wip/issue_535

Add specs for issue 535