Merge pull request #1 from yotamhc/master

Initial code upload
Merge pull request #2 from yotamhc/master

Fixed issues that prevented non-hybrid mode from running correctly
Update README.md
Update README.md