Closes #11 and #12