#401 Added some docblocks