Created by: ritwickdsouza
References #6 (closed) . Creating new PR because made some mistake while sqaushing.