Closes #5 and #6