Closes #174