closes #127