Closes #166