closes #28