Sprint 2
Merge pull request #67 from nilesh88/master

Sprint 2