closes #137, closes #19