closes #2 and #4