closes #239