diff --git a/robotgo.go b/robotgo.go
index 417ed68..5fe5824 100644
--- a/robotgo.go
+++ b/robotgo.go
@@ -1358,8 +1358,21 @@ func MaxWindow(pid int32, args ...interface{}) {
 }
 
 // CloseWindow close the window
-func CloseWindow() {
-	C.close_window()
+func CloseWindow(args ...int32) {
+	if len(args) <= 0 {
+		C.close_main_window()
+		return
+	}
+
+	var hwnd, isHwnd int32
+	if len(args) > 0 {
+		hwnd = args[0]
+	}
+	if len(args) > 1 {
+		isHwnd = args[1]
+	}
+
+	C.close_window(C.uintptr(hwnd), C.uintptr(isHwnd))
 }
 
 // SetHandle set the window handle
diff --git a/window/goWindow.h b/window/goWindow.h
index 526feb5..5638092 100644
--- a/window/goWindow.h
+++ b/window/goWindow.h
@@ -75,8 +75,8 @@ void max_window(uintptr pid, bool state, uintptr isHwnd){
 	#endif
 }
 
-void close_window(void){
-	CloseWin();
+void close_window(uintptr pid, uintptr isHwnd){
+	close_window_by_PId(pid, isHwnd);
 }
 
 bool set_handle(uintptr handle){