closes #24