closing #17 and #2