Issue #504 adding specs