Address issue #1 and add additional documentation