closes #137