Merge pull request #2 from raajakumar/master