closes #125
closes #124