closes #18, #24