Merge pull request #123 from chennan47/develop

 small fix for guid
fix for regression tests