Done a handful of changes. Creatd a main class (should be moved to a different file)
Merge pull request #1 from maor/master

Done a handful of changes...