Closing #9 and #30.