Closes #24