Merge remote-tracking branch 'upstream/master'

docker-compose-generator/src/Program.cs

@@ -105,11 +105,16 @@ namespace DockerGenerator
 
 		private string FindLocation(string path)
 		{
+			string directory = path;
+			int i = 0;
 			while(true)
 			{
+				if(i > 10)
+					throw new DirectoryNotFoundException(directory);
 				if(Directory.Exists(path))
 					return path;
 				path = Path.Combine("..", path);
+				i++;
 			}
 		}
 	}