Code review 1
Code review 2
Merge pull request #2 from khushbug-optimus/CodeReview_sprint10_12Dec14

Code review sprint10 12 dec14