Closes #160