pcpiela Merge pull request #2 from kgururaj/master