Closes #158