Closes #129