Closes #120