diff --git a/README.md b/README.md
index e6732ac..e6dfe9a 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,8 @@ MiniFB
 
 MiniFB (Mini FrameBuffer) is a small cross platform library that makes it easy to render (32-bit) pixels in a window. An example is the best way to show how it works:
 
-	if (!mfb_open("my display", 800, 600))
+	struct Window *window = mfb_open_ex("my display", 800, 600, WF_RESIZABLE);
+	if (!window)
 		return 0;
 
 	for (;;)
@@ -18,10 +19,66 @@ MiniFB (Mini FrameBuffer) is a small cross platform library that makes it easy t
 			break;
 	}
 
-	mfb_close();
+
+Furthermore, you can add callbacks to the windows:
+
+	void active(struct Window *window, bool isActive) {
+		...
+	}
+
+	void resize(struct Window *window, int width, int height) {
+		...
+		// Optionally you can also change the viewport size
+		mfb_set_viewport(window, x, y, width, height);
+	}
+
+	void keyboard(struct Window *window, Key key, KeyMod mod, bool isPressed) {
+		...
+		// Remember to close the window in some way
+		if(key == KB_KEY_ESCAPE) {
+			mfb_close(window);
+		}
+	}
+
+	void char_input(struct Window *window, unsigned int charCode) {
+		...
+	}
+
+	void mouse_btn(struct Window *window, MouseButton button, KeyMod mod, bool isPressed) {
+		...
+	}
+
+	// Use wisely this event. It can be sent too often
+	void mouse_move(struct Window *window, int x, int y) {
+		...
+	}
+
+	// Mouse wheel
+	void mouse_scroll(struct Window *window, KeyMod mod, float deltaX, float deltaY) {
+		...
+	}
+
+	struct Window *window = mfb_open_ex("my display", 800, 600, WF_RESIZABLE);
+	if (!window)
+		return 0;
+
+	mfb_active_callback(window, active);
+	mfb_resize_callback(window, resize);
+	mfb_keyboard_callback(window, keyboard);
+	mfb_char_input_callback(window, char_input);
+	mfb_mouse_button_callback(window, mouse_btn);
+	mfb_mouse_move_callback(window, mouse_move);
+	mfb_mouse_scroll_callback(window, mouse_scroll);
 
 
-First the code creates window with the mfb_open call that is used to display the data, next it's the applications resposiblity to allocate a buffer (which has to be at least the size of the window and in 32-bit) Next when calling mfb_update function the buffer will be copied over to the window and displayed. Currently the mfb_update will return -1 if ESC key is pressed but later on it will support to return a key code for a pressed button. See https://github.com/emoon/minifb/blob/master/tests/noise.c for a complete example
+Additionally you can set data per window and recover it
+
+	mfb_set_user_data(window, (void *) myData);
+	...
+	myData = (someCast *) mfb_get_user_data(window);
+
+
+First the code creates window with the mfb_open call that is used to display the data, next it's the applications responsibility to allocate a buffer (which has to be at least the size of the window and in 32-bit) Next when calling mfb_update function the buffer will be copied over to the window and displayed. Currently the mfb_update will return -1 if ESC key is pressed but later on it will support to return a key code for a pressed button. See https://github.com/emoon/minifb/blob/master/tests/noise.c for a complete example
 
 MiniFB has been tested on Windows, Mac OS X and Linux but may of course have trouble depending on your setup. Currently the code will not do any converting of data if not a proper 32-bit display can be created.
 
@@ -30,24 +87,56 @@ Build instructions
 
 MiniFB uses tundra https://github.com/deplinenoise/tundra as build system and is required to build the code as is but not many changes should be needed if you want to use it directly in your own code.
 
+You can also use CMake as build system.
+
 Mac
 ---
 
 Cocoa and clang is assumed to be installed on the system (downloading latest XCode + installing the command line tools should do the trick) then to build run: tundra2 macosx-clang-debug and you should be able to run the noise example (t2-output/macosx-clang-debug-default/noise)
 
+MacOS X Mojave does not support Cocoa framework as expected. For that reason now you can switch to Metal API.
+To enable it just compile defining the preprocessor macro USE_METAL_API.
+
+If you use CMake just enable the flag:
+
+	mkdir build
+	cd build
+	cmake .. -DUSE_METAL_API=ON
+
+or if you don't want to use Metal API:
+
+	mkdir build
+	cd build
+	cmake .. -DUSE_METAL_API=OFF
+
+
 Windows
 -------
 
 Visual Studio (ver 2012 express has been tested) tools needed (using the vcvars32.bat (for 32-bit) will set up the enviroment) to build run: tundra2 win32-msvc-debug and you should be able to run noise in t2-output/win32-msvc-debug-default/noise.exe
 
+If you use CMake the Visual Studio project will be generated (2015, 2017 and 2019 have been tested).
+
 
 x11 (FreeBSD, Linux, *nix)
 --------------------------
 
 gcc and x11-dev libs needs to be installed. To build the code run tundra2 x11-gcc-debug and you should be able to run t2-output/x11-gcc-debug-default/noise
 
+If you use CMake just disable the flag:
+
+	mkdir build
+	cd build
+	cmake .. -DUSE_WAYLAND_API=OFF
+
+
 wayland (Linux)
 --------------------------
 
-Depends on gcc and wayland-client. Built using the wayland-gcc variants.
+Depends on gcc and wayland-client and wayland-cursor. Built using the wayland-gcc variants.
 
+If you use CMake just enable the flag:
+
+	mkdir build
+	cd build
+	cmake .. -DUSE_WAYLAND_API=ON