new feature done
Merge branch 'nez_feature'