closes #17 and #7