closes #139