Activate specs for issue 574
Merge pull request #111 from xzyfer/wip/activate-issue-574

Activate specs for issue 574