Closes #1 and #2