Activate specs for issue 659
Merge pull request #199 from xzyfer/feat/issue-659

Activate specs for issue 659
Add specs for issue 590
Merge pull request #200 from xzyfer/feat/activate-590

Add specs for issue 590