closes #1 and #2