Activate specs for issue 641
Merge pull request #139 from xzyfer/wip/activate-issue-641

Activate specs for issue 641