Closes #154