All tests pass. Closes #150