closes #129