necomplus some updates
Merge origin/master
some updates