closes #30