Closes #142