Fixed Issues #9, #14, #16

Also updated the documentation to reflect the changes.