Preparation for publish

We must re-think this commit. Maybe there is better way.