Activate specs for issue 736
Merge pull request #183 from xzyfer/wip/activate-736

Activate specs for issue 736