closes #23
Closes #24