closes #161