Fix up for version 0.7.1

Closes #141. Closes #143