Closes #179