jdiez17 Merge pull request #668 from rahul286/patch-1