Closing #12 and #13