Eugene Merge pull request josecebe#3 from natrajsr/patch-1