alpha version
Merge http://github.com/riwette/notion