This is supposed to be equivalent to Guo, but confirmed to be working for non-SRT. Also includes two test cases:
Fixes #11 (closed)