Merge pull request #1 from rajithv/master

Sachini's branch