Closes #12