closes #123