Update

An update to the initial update. Added @return tags for the accessor
methods