diff --git a/README.md b/README.md
index 9b87c1a..2e2852a 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,12 @@ VERSION HISTORY
**CONTAINS UNRELEASED CHANGES, MAY BE UNSTABLE**
+<<<<<<< HEAD
* minor CSS 3D fixes
+=======
+* basic API to control the presentation flow from JavaScript
+* touch event support
+>>>>>>> api
### 0.2 ([browse](http://github.com/bartaz/impress.js/tree/0.2), [zip](http://github.com/bartaz/impress.js/zipball/0.2), [tar](http://github.com/bartaz/impress.js/tarball/0.2))
diff --git a/index.html b/index.html
index 65bc93c..6649992 100644
--- a/index.html
+++ b/index.html
@@ -280,12 +280,40 @@
Last, but not least.
To make all described above really work, you need to include impress.js in the page.
+ I strongly encourage to minify it first.
+
+ In here I just include full source of the script to make it more readable.
+
+ You also need to call a `impress()` function to initialize impress.js presentation.
And you should do it in the end of your document. Not only because it's a good practice, but also
- because I was lazy, haven't wrapped the code in any kind of "DOM ready" event, so it will not work
- if included too early in the source ;)
+ because I should be done when the whole document is ready.
+ Of course you can wrap it in any kind of "DOM ready" event, but I was to lazy to do so ;)
-->
+
+
+