Resolves #12 and refactores close logic