Merge pull request #140 from glenwks/master

reduction of multiple retrieving of data