closes #136