Closes #17, #18