[*]added 2 versions
Merge branch 'feature' into dev