Activate specs for issue 261
Merge pull request #121 from xzyfer/wip/activate-issue-261

Activate specs for issue 261