v1.0.4 - slight spec refactor