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

Activate specs for issue 610