Closes #20