closes #130