closes #134