Closes #156; closes #157