Closes #23 and #24