fixed hold requests
manual merge
Merge pull request #60 from g2-aj/branch_alshahna

Branch alshahna