compatible with norma version 0.1.0
fixed merge conflicts