Closes #162