Closes #161