Closes Issues #5 and #6