Closes #149