closes #128, closes #126