Merge pull request #3 from ozayyad/Johnny

Johnny