Tested 3.8. Closes #89