Merge pull request #2 from tailorck/master

Chirag's Second Commit