closes #138 #127