Merge pull request:  Migrate cloud project to local #169