closes #159