Merge pull request #101 from dadbodgeoff/fix/phase-a-correctness