Feature/refaktor onepercent

Merge release 1% in to refaktor