Activate specs for issue 610
Activate specs for issue 579
Merge pull request #119 from xzyfer/wip/activate-issue-579

Activate specs for issue 579
Merge pull request #120 from xzyfer/wip/activate-issue-610

Activate specs for issue 610