Add retry to accomodate slow VM environments
Merge pull request #462 from vedujoshi/master

Add retry to accomodate slow VM environments