pats changes
Touch ups
Merge pull request #2 from uri/pat

Changed main file