Feature/prepare for publish