Closes #148