init ns-pojo
Merge branch 'master' into develop