Sprint 2
Merge pull request #61 from sohin76/master

Sprint 2 and Updated Code