This one is actually refactored on the base of
41b5a5b6 and fd4f2a67 commits but let's consider
it to be the first released one ;-)