Georges changes
Merge pull request #2 from gbanis/georges_branch

Georges changes