Revert "Gideon branch"
Merge pull request #3 from GSamuel/revert-2-Gideon-Branch

Revert "Gideon branch"