closes #153