Closes #123