UPDATED AND WORKS
Merge pull request #77 from g2-aj/branch_alshahna

UPDATED AND WORKS