this commit closes #104 and #98