closes #141