gui change
manual merge
Merge pull request #69 from g2-aj/branch_alshahna

Branch alshahna